home *** CD-ROM | disk | FTP | other *** search
/ AGA Toolkit '97 / The AGA Toolkit '97.iso / programming / debug / calls / calls.diff < prev    next >
Encoding:
Text File  |  1996-09-07  |  4.2 KB  |  139 lines
  1. diff -r -w --unif=2 calls/Makefile calls-amiga/Makefile
  2. --- calls/Makefile    Thu May  7 13:42:35 1992
  3. +++ calls-amiga/Makefile    Thu Nov 30 14:42:26 1995
  4. @@ -8,7 +8,11 @@
  5.  L=
  6.  
  7. -CC=gcc -DMACRO_BSTRING
  8. +# Options:
  9. +# -DBADCALLOC        if calloc doesn't zero mem
  10. +# -DOLD_BROKEN_SPRINTF    if your sprintf returns char * instead of int,
  11. +#            eg. on SunOS
  12. +CC=gcc
  13.  INCLUDE=
  14. -DEBUG=    -O
  15. +DEBUG=
  16.  CDEFS= 
  17.  CFLAGS=    ${DEBUG} ${CDEFS} ${INCLUDE}
  18. @@ -22,7 +26,7 @@
  19.  
  20.  calls: ${OBJ}
  21. -    ${CC} -o $@ ${CFLAGS} ${OBJ}
  22. +    ${CC} -s -o $@ ${CFLAGS} ${OBJ}
  23.  
  24. -clean: FRC
  25. +clean:
  26.      rm -f Makefile.bak calls *.o a.out core errs tags
  27.  
  28. Only in calls: calls
  29. diff -r -w --unif=2 calls/main.c calls-amiga/main.c
  30. --- calls/main.c    Thu May  7 13:39:19 1992
  31. +++ calls-amiga/main.c    Thu Nov 30 14:45:45 1995
  32. @@ -10,5 +10,8 @@
  33.  #include <errno.h>
  34.  #include <strings.h>
  35. -
  36. +#ifdef __amigados__
  37. +#include <stdlib.h>
  38. +#include <unistd.h>
  39. +#endif
  40.  #include "scan.h"
  41.  #include "getopt.h"
  42. @@ -33,5 +36,9 @@
  43.      *pchProg,        /* argv[0]                */
  44.      cppcommand[1024] =    /* cpp command string            */
  45. +#ifndef __amigados__
  46.          "/lib/cpp -P ";
  47. +#else
  48. +        "/bin/gcc -E -P ";
  49. +#endif
  50.  static HASH
  51.      *activelist[MAXDEPTH];    /* list of current output names        */
  52. @@ -217,4 +224,5 @@
  53.                  iWidth = PAPERWIDTH;
  54.              break;
  55. +#ifdef OLD_AND_BROKEN_SPRINTF
  56.          case 'D':
  57.              strcat(cppcommand, (const char *)
  58. @@ -229,4 +237,18 @@
  59.                          sprintf(sbTemp, "-U%s ", optarg));
  60.              break;
  61. +#else
  62. +        case 'D':
  63. +            sprintf(sbTemp, "-D%s ", optarg);
  64. +            strcat(cppcommand,sbTemp);
  65. +            break;
  66. +        case 'I':
  67. +            sprintf(sbTemp, "-I%s ", optarg);
  68. +            strcat(cppcommand,sbTemp);
  69. +            break;
  70. +        case 'U':
  71. +            sprintf(sbTemp, "-U%s ", optarg);
  72. +            strcat(cppcommand,sbTemp);
  73. +            break;
  74. +#endif /* sprintf */
  75.          case '?':
  76.          case 'h':
  77. diff -r -w --unif=2 calls/scan.c calls-amiga/scan.c
  78. --- calls/scan.c    Thu May  7 13:34:25 1992
  79. +++ calls-amiga/scan.c    Tue Nov 28 15:21:14 1995
  80. @@ -10,4 +10,7 @@
  81.  #include <stdio.h>
  82.  #include <strings.h>
  83. +#ifdef __amigados__
  84. +#include <stdlib.h>
  85. +#endif
  86.  #define strsave(X)    strcpy((char *)malloc(strlen((X))+1), (X))
  87.  
  88. @@ -20,14 +23,17 @@
  89.      {nilHASH, nilHASH};
  90.  static char 
  91. -    AUTO[] = "auto",    BREAK[] = "break",    CASE[] = "case",
  92. -    CHAR[] = "char",    CONTINUE[] = "continue",DEFAULT[] = "default",
  93. -    DO[] = "do",        DOUBLE[] = "double",    ELSE[] = "else",
  94. -    ENUM[] = "enum",    EXTERN[] = "extern",    FLOAT[] = "float",
  95. -    FOR[] = "for",        FORTRAN[] = "fortran",    GOTO[] = "goto",
  96. -    IF[] = "if",        INT[] = "int",        LONG[] = "long",
  97. +    ASM[] = "asm",          AUTO[] = "auto",        BREAK[] = "break",
  98. +    CASE[] = "case",        CHAR[] = "char",        CONST[] = "const",
  99. +    CONTINUE[] = "continue",DEFAULT[] = "default",  DO[] = "do",
  100. +    DOUBLE[] = "double",    ELSE[] = "else",        ENUM[] = "enum",
  101. +    EXTERN[] = "extern",    FLOAT[] = "float",      FOR[] = "for",
  102. +    FORTRAN[] = "fortran",  GOTO[] = "goto",        IF[] = "if",
  103. +    INT[] = "int",          LONG[] = "long",
  104.      REGISTER[] = "register",RETURN[] = "return",    SHORT[] = "short",
  105. -    SIZEOF[] = "sizeof",    STATIC[] = "static",    STRUCT[] = "struct",
  106. -    SWITCH[] = "switch",    TYPEDEF[] = "typedef",    UNION[] = "union",
  107. -    UNSIGNED[] = "unsigned",VOID[] = "void",    WHILE[] = "while";
  108. +    SIGNED[] = "signed",    SIZEOF[] = "sizeof",    STATIC[] = "static",
  109. +    STRUCT[] = "struct",    SWITCH[] = "switch",
  110. +    TYPEDEF[] = "typedef",  UNION[] = "union",
  111. +    UNSIGNED[] = "unsigned",VOID[] = "void",
  112. +    VOLATILE[] = "volatile",WHILE[] = "while";
  113.  
  114.  HASH *
  115. @@ -149,9 +155,9 @@
  116.  {
  117.      static char *keywords[] = {
  118. -        AUTO, BREAK, CASE, CHAR, CONTINUE, DEFAULT,
  119. +        ASM, AUTO, BREAK, CASE, CHAR, CONST, CONTINUE, DEFAULT,
  120.          DO, DOUBLE, ELSE, ENUM, EXTERN, FLOAT, FOR,
  121.          FORTRAN, GOTO, IF, INT, LONG, REGISTER,
  122. -        RETURN, SHORT, SIZEOF, STATIC, STRUCT, SWITCH,
  123. -        TYPEDEF, UNION, UNSIGNED, VOID, WHILE, (char *)0
  124. +        RETURN, SHORT, SIGNED, SIZEOF, STATIC, STRUCT, SWITCH,
  125. +        TYPEDEF, UNION, UNSIGNED, VOID, VOLATILE, WHILE, (char *)0
  126.      };
  127.      register int i = 0;
  128. @@ -182,7 +188,7 @@
  129.  {
  130.      static char *which[] = {    /* keywords mark a declaration    */
  131. -        AUTO, CHAR, STATIC, DOUBLE, ENUM, EXTERN, FLOAT, INT,
  132. -        LONG, REGISTER, SHORT, STATIC, STRUCT, TYPEDEF, UNION,
  133. -        UNSIGNED, VOID, (char *) 0};
  134. +        AUTO, CHAR, CONST, DOUBLE, ENUM, EXTERN, FLOAT, INT,
  135. +        LONG, REGISTER, SHORT, SIGNED, STATIC, STRUCT, TYPEDEF, UNION,
  136. +        UNSIGNED, VOID, VOLATILE, (char *) 0};
  137.      register char **psb = which;
  138.  
  139.